From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 27 May 2011 08:52:08 +0000 (+0200)
Subject: skip delivery reports in pending messages (#651227)
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8207
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7b65735cc9f9158089614000438491694eb5ec25;p=gnome-shell.git

skip delivery reports in pending messages (#651227)

We already ignore them in _messageReceived but have to ignore them as well
when displaying pending messages.
---

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 18f4f88d7..9c00cf938 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -240,7 +240,16 @@ Source.prototype = {
         let logMessages = events.map(makeMessageFromTplEvent);
 
         let pendingTpMessages = this._channel.get_pending_messages();
-        let pendingMessages = pendingTpMessages.map(function (tpMessage) { return makeMessageFromTpMessage(tpMessage, NotificationDirection.RECEIVED); });
+        let pendingMessages = [];
+
+        for (let i = 0; i < pendingTpMessages.length; i++) {
+            let message = pendingTpMessages[i];
+
+            if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
+                continue;
+
+            pendingMessages.push(makeMessageFromTpMessage(message, NotificationDirection.RECEIVED));
+        }
 
         let showTimestamp = false;